Don't include page->menu_label - causes various problems, including

Mon Aug 25 17:28:04 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_forall): Don't
        include page->menu_label - causes various problems,
        including #12047.

diff --git a/ChangeLog b/ChangeLog
index 4f110ccb58e2b787a07ac78a9db7430dd5786e3e..91a9358f013f14b0344804dbcb37a215b61a17ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 25 17:28:04 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_forall): Don't
+       include page->menu_label - causes various problems,
+       including #12047.
+
 Mon Aug 25 23:21:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        Merge from stable.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4f110ccb58e2b787a07ac78a9db7430dd5786e3e..91a9358f013f14b0344804dbcb37a215b61a17ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Aug 25 17:28:04 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_forall): Don't
+       include page->menu_label - causes various problems,
+       including #12047.
+
 Mon Aug 25 23:21:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        Merge from stable.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4f110ccb58e2b787a07ac78a9db7430dd5786e3e..91a9358f013f14b0344804dbcb37a215b61a17ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Aug 25 17:28:04 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_forall): Don't
+       include page->menu_label - causes various problems,
+       including #12047.
+
 Mon Aug 25 23:21:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        Merge from stable.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4f110ccb58e2b787a07ac78a9db7430dd5786e3e..91a9358f013f14b0344804dbcb37a215b61a17ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Aug 25 17:28:04 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_forall): Don't
+       include page->menu_label - causes various problems,
+       including #12047.
+
 Mon Aug 25 23:21:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        Merge from stable.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4f110ccb58e2b787a07ac78a9db7430dd5786e3e..91a9358f013f14b0344804dbcb37a215b61a17ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Aug 25 17:28:04 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_forall): Don't
+       include page->menu_label - causes various problems,
+       including #12047.
+
 Mon Aug 25 23:21:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        Merge from stable.

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9f6db3b7ce2a8b09faf07988d56afb4fe69b1516..6cf9800ef6eae487d1713813190ee8a71f8de2f0 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2400,8 +2400,6 @@ gtk_notebook_forall (GtkContainer *container,
        {
          if (page->tab_label)
            (* callback) (page->tab_label, callback_data);
-         if (page->menu_label)
-           (* callback) (page->menu_label, callback_data);
        }
     }
 }